From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 1 May 2004 21:19:31 +0000 (+0000)
Subject: (calc_line_height_property): YAILOM (yet another int/Lisp_Object mixup).
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22775
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=aa31291933ff9521f151df0c434a114bba4d074b;p=emacs.git

(calc_line_height_property): YAILOM (yet another int/Lisp_Object mixup).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0fc01752c14..7bdca7ec249 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* xdisp.c (calc_line_height_property): YAILOM (yet another
+	int/Lisp_Object mixup).
+
 2004-05-01  Eli Zaretskii  <eliz@gnu.org>
 
 	* msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to
diff --git a/src/xdisp.c b/src/xdisp.c
index 2ae2a7333ee..8ccd08ebae7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18572,12 +18572,12 @@ calc_line_height_property (it, prop, font, boff)
 
       face_id = lookup_named_face (it->f, face_name, ' ');
       if (face_id < 0)
-	return -1;
+	return make_number (-1);
 
       face = FACE_FROM_ID (it->f, face_id);
       font = face->font;
       if (font == NULL)
-	return -1;
+	return make_number (-1);
 
       font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id);
       boff = font_info->baseline_offset;